From a803836657285157e400a3954b6d07ee5fca8034 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 11 Jun 2006 02:59:51 +0000 Subject: [PATCH] Fix bug 344518 --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtkprintoperation-unix.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 00f7c5046d..4cdf3ddbe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-06-10 Matthias Clasen + * gtk/gtkprintoperation-unix.c (page_setup_data_free): + Check if rdata->page_setup is set before unreffing it. + (#344518, Christian Persch) + * gtk/gtkprintoperation.h: Remove an extra comma. (#344528, Elijah Newren) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 00f7c5046d..4cdf3ddbe8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-06-10 Matthias Clasen + * gtk/gtkprintoperation-unix.c (page_setup_data_free): + Check if rdata->page_setup is set before unreffing it. + (#344518, Christian Persch) + * gtk/gtkprintoperation.h: Remove an extra comma. (#344528, Elijah Newren) diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 4eb81c097b..15338564a0 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -693,7 +693,9 @@ page_setup_data_free (gpointer data) { PageSetupResponseData *rdata = data; - g_object_unref (rdata->page_setup); + if (rdata->page_setup) + g_object_unref (rdata->page_setup); + g_free (rdata); } -- 2.30.2